// TestOne.java
// 
// for testing out git & distributed version control 

//import java.util.*;
//import java.io.*;

// A CHANGE

public class TestOne
{
    public static void main(String argv[]) {
        System.out.println("This is Eric's change. Did it overwrite Mike's?  \r\nThis is Mike's change; should get a conflict.  This is another change, lets see who's code stays!");
    }
    
    private final String cmdLineTest = "ok";

    private final String MikeAddedThis() { return "Mike Added This"; }
}

